Make sure we set the current clip plane to off.
Cleaned up some uniform management code.