Merge "Remove some unnecessary items from WellKnownClasses."