one refactor
It worked?

My little rewrite appears to have worked.  I am quite suprised!