Use CoreSubst.simpleOptExpr in place of the ad-hoc simpleSubst (reduces code too)