Switched all use of vertex_s to Vertex (the C++ class)

Now vertex_s is free for merging into Vertex.