Renaming the build options, to reduce the number of variables/definitions floating around and simplify things.