Additional build process cleanup; normalize version.mk contents.