Minor simplifications.