More call verifier refactoring.