Big refactor of call verifier. Still testing, up to calledOn().