Cleaned up scanner handler function arguments.
Cleaned up scanner handler function arguments.

The scanner handler function arguments got a bit messy when we switched
to the race-free traversal infrastructure, so this commit cleans them up
slightly and makes them a bit more consistent.

havoc-io/mutagen,havoc-io/mutagen