Misc. build system cleanups
Some drive-by changes while working on subprojects, see patches.
Also taking advantage of build system changes not being subject to the freeze break
Some drive-by changes while working on subprojects, see patches.
Also taking advantage of build system changes not being subject to the freeze break