Strengthen abstractions in the renderer