Merge "Simplification for associative and commutative operations on constants"