Minor simplifications in conditions