Yet more simplification