Remove assertThrows and use assert.throw instead
Fix error in parsing Arguments

Make sure we do not allow trailing commas in arguments.

Fixes #570