Some more simplifications.