re #91: Do not expose klass object