Make ConstExpr implementation a bit more concise
#2059
Merged
ConstExpr implementation a bit more concise
#2059