Merge "More use of WellKnownClasses for debugger"