Minorly-nicer build code