Modest improvement to build system.