Whitespace and reorg.
Factoring out some utilities.
Eliminate field versions.
Generator and environment WIP.