Move a couple preprocessor things, fix a warning message for correctness.