Resolve compile time errors by changing macro expansion