Remove uses of the comma operator