Merge "style: fix up commas in function arguments"