More work on eliminating introspect interface