Change: Minor build system trials.