(#6582) eliminate a backtrace from mismatched block arguments.

This was tightly coupled to the code implementation; it mostly still is, but
now allows argument extension without needing to adjust the test which is
only focused on the first argument anyhow.

Reviewed-By: Nick Lewis <nick@puppetlabs.com>