Allow elimination of unevaluated terms by default (#8136)