Remove uses of the comma operator
Merge pull request #716 from yebblies/commaop

[trivial] Remove uses of the comma operator