Fix assignment of result of arithmetic assignment

Fix broken assignment of result of arithmetic assignment - a regression that was introduced prior to automation.

+ Focused integration tests
+ Cruft removal