Rewritten and tested to my usual standards, i.e., it compiles
and my one test didn't abort.