Improve GL state machine some more with less hacks