Massaging the build process

Preparing ground for further work on build scripts.
See 319aed2