Yet more simplifications.