More of Glasser's code review comments