Add an "args" argument to the policy-related functions.
Fixed unit tests broken by the pull request.