Fix 1.8.7 bug - trailing comma in arg list