Made some more changes affecting `NoEval` and Authorizations. Getting ready for tests.