Allow self in return type when appropriate