More simplifications using methods on common superclasses.