Additional simplifications.