refactor[important]: Aggregate inputs to `verify_step` and `verify_skip`

[ratankaliani]

verify_step and verify_skip have become unwieldy, create a Variable to encompass the underlying types. Do this after merging the audit changes.