Add hasVertex private method to reduce duplication w/out deadlocking.
Bunch more tests, with corresponding fixes.