Cleaned up some of the preprocessor stuff.