Merge "Misc cleanup for class redefinition."