Changes for build script simplification.