(GX) Replace more functions with macro'ed/inlined versions