Fix 1.8.7 syntax errors.

- 1.8.7 doesn't allow defaults for bock args.
- 1.8.7 doesn't allow trailing commas in lists.