Merge "Avoid marking erroneous classes as erroneous twice."