Fixed clang macro expansion errors