Changes in prep for writing the renderer.