Tidy up NoteVerifier a little