Refactor VertexDescriptor population; shouldn't be out of sync