I think the addition of ArbitraryCondition to condition.py should enable some other code in that file to be simplified significantly. E.g., ComparisonCondition could probably be simplified a lot by using ArbitraryCondition.