Final version of the bugfix for 572

Fixes #572
Improves upon #573 
`$arguments` has both numeric indexes as named keys: https://github.com/Behat/Behat/pull/577/files#diff-f249ccb5e9652d4d67c49bf2d0689c94R177