More refactoring, piping through "wrapper name" so downstream code need not use introspector