Even more fixes to the build system that regressed since the
big change...