Cleanup, removed use of "geometry" pseudo-type as a literal throughout the code.