yet more simplification of P26.hs