Introspection non-fixes.