smurf: Correct some arguments that are incorrectly flagged as unused.