Use ToExpr trait instead of ad-hoc expr functions

Use ToExpr trait instead of ad-hoc expr functions #2920