Update gfx_macros for the Gc -> P change in syntax