Replace naked Read-Modify-Write ops on shared values which will be banned.
Merge pull request #714 from AndrejMitrovic/Prepare3672

Replace naked Read-Modify-Write ops on shared values which will be banned.
Remove uses of the comma operator
Merge pull request #716 from yebblies/commaop

[trivial] Remove uses of the comma operator