Some more work on the rendering architecture.