Massage the super method

These changes fail to fix MON-234 gh-1348, but in the process add
comments, massage style, and fix theoretical internal consistency
problems introduced by thrown exceptions and nested and repeated super
calls, for which I have provided no evidence of their necessity.