am 663796fb: Merge "Fix and improve static evaluation of constant expressions."

* commit '663796fb14accb722e9b37c4fe8c3d2588680d7e':
  Fix and improve static evaluation of constant expressions.