Fix more trailing commas