A bit more simplification.