Some minor cleanup

Instead, I would have checked that there are 0 arguments as expected (like done below) or throw an exception.