Have add-handler include the function arguments

Addresses #898