Cleanup DepthState + Viewport

Round 3.