Even more simplification.