2.3 better attempt

This should hopefully work better, although it doesn't quite follow the
spirit of the question. I think my structure was probably a bit too
fancy for its own good.