Minor Viewport code clean up.