More simplification (I hope).