Refactored VertexHopCriteria slightly.