PG-1433: [WIP] Fixed up code (and comments) enough to get it to build.
PG-1433: [WIP] Fixed up code (and comments) enough to get it to build.

New/modified tests pass, but a few others are broken (mostly in ways we might not care about though).

sillsdev/Glyssen,sillsdev/Glyssen