Get rid of "pointer", and the now-unused "POINTER", and I'll merge it.