anchor.diff:  %%                      Req :: wm_req(),
   %%                      State :: #base_state{}) -> true | false | Error :: term().
   has_permission(AuthzObjectType, AuthzId, Permission, Req, #base_state{reqid=ReqId,
  -                                                                      requestor=Requestor}=State) ->
  -    #chef_requestor{authz_id = RequestorId} = Requestor,
  +                                                                      requestor_id=RequestorId}=State) ->
       ?SH_TIME(ReqId, chef_authz, is_authorized_on_resource,
                     (RequestorId, AuthzObjectType, AuthzId, actor, RequestorId, Permission)).
   
   %% NOTE: derives the permission check from the HTTP verb of the Request
   check_permission(AuthzObjectType, AuthzId, Req, #base_state{reqid=ReqId,
  -                                                            requestor=#chef_requestor{
  -                                                              authz_id = RequestorId}
  +                                                            requestor_id=RequestorId
                                                              }=State) ->
       Perm = http_method_to_authz_perm(Req),
       case has_permission(AuthzObjectType, AuthzId, Perm, Req, State) of
  
positive.code:                     {Req2, State2} = set_forbidden_msg(Permission, Req1, State1),
                      {true, Req2, State2};
                  {Error, {AuthzObjectType, AuthzId, Permission}} ->
                      #base_state{requestor=#chef_requestor{authz_id=RequestorId}} = State1,
                      %% TODO: Extract this logging message, as it is used elsewhere, too
                      error_logger:error_msg("is_authorized_on_resource failed (~p, ~p, ~p): ~p~n",
                                             [Permission, {AuthzObjectType, AuthzId}, RequestorId, Error]),
  
negative.code: %% with the different resource_state records).
  create_in_container(Container, Req, #base_state{chef_authz_context = AuthzContext,
                                                  organization_guid = OrgId,
                                                  requestor_id = RequestorId,
                                                  resource_state = RS} = State) ->
      case chef_authz:create_object_if_authorized(AuthzContext, OrgId, RequestorId,
                                                  Container) of
          {ok, AuthzId} ->
  