Further improvements to verify.h, suggested by Eric Blake.