Minor improvements to verify.