In preparation of supporting validators that take into account the identity of the requestor (as per issue #11).