remove bare raw pointers in macros