Removing more while loops
Test that we don't get demangled names of super-types