Implemented #83729086. Calling super is now safer. Also streamlined the ...

...super implementation to move the conditional out of the generated method.