More simplifications.