etc
Optimize CVs by eliminating GVs where possible

The various weirdly-named commits leading up to this one are part of
it and will be squashed.

This does not fully work yet.  minitest passes, but make still fails.