1.8.0-rc1 cherry-pick request: Disable square rewrite for complex types, re-enable arithmetic optimizations for tests