Nicer fix for trailing comma