Merge "Clean up Class::FindStaticField()."