Further build system improvements.