Fix commas as well as paren