StructureHandlerRegistry instance persists. Tweak accesors now that it contains immutable lists.