removed unnecessary token pasting (##) preprocessor directives that blew