Fix assignment of result of arithmetic assignment

+ Focused integration tests
+ Cruft removal