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

* commit '1339409345cc8b46d64570430ca3197408fda159':
  Have constant folding be more flexible.