Silence a lot more trailing comma warnings