whitespace CGL cleanup in preparation for a later RFC