- Minor simplification.