Here are notes on a medium-sized commit by jrose to clean up groovy.g.

Affected source files:

Functional changes

Cleanups