policy/trival: rename "policy" argument to "self"