Simplify add_vertex a bit