Some modifications to Condition.