Build tool compiles properly again.  Phew.  Reorganized its massive collection of types.