Issue #174: refactored to use existing RenderableStateWrapper inner class