Operator constant folding rewrite almost complete, just need to track down why two tests are failing.