Make classpath hack more robust
Break apart long lines in verify.rs