Merge "Clean up 669-moveable-string-class-equals."