Properly check that all parameters have been consumed.

And do it right this time.