(GL) Get rid of some more _func macros