Revert r77730 and add back verify and vereq in case other projects use them, but leave the changes in test_pprint and string_tests.