Continue Config.pp port and cleanup build-type conditional defaults.