My version now looks like Pete's version (finally!), although I'm not
convinced they're correct.