Correctness fixes on top of policy-registry impl#11

eric-ships merged 3 commits into

impl/policy-registrybase/base-std:impl/policy-registryfrom

amie/correctness-fixesbase/base-std:amie/correctness-fixesCopy head branch name to clipboard