Corrected some preprocessor insert positions.