Remove explicit __class__ indirection; self.attr is the same thing.