Improve verify() calls