remove whitespace from preprocessor macros (again)