Refactor the patching code to pass args lower in the call stack
    
    The code is complicated by passing behaviour options through multiple
    levels. This is already hard to read because the names are different
    at different levels. Let's just pass args, so that it's easy to add
    new options in the future.