Improved condition evaluation.