Cleaned up the preprocessor definitions.