Remove the use of evalExpr from condition functions
5 files changed