Moved the argument collection for local variable setting support to step...

...s rather than leaving on scenario