1340: Changing RenderContext from an inner class to a nested class with its own generics

1340: Changing RenderContext from an inner class to a nested class with its own generics #4798