Minor build script simplification