Working through a minor refactor of RenderVariables.