am 75fe3e02: am 13394093: Merge "Have constant folding be more flexible."

* commit '75fe3e02fdc0c81b81f8ffbdb982f214b4995691':
  Have constant folding be more flexible.