cleanup and consolidate glGet
Merge branch 'glGet-cleanup' into incoming