Cleaning up some GL abstraction from Q3.