I think this pull request would be leaner without the canvas skeletons for VectorLayer2 - @tschaub and I are planning to integrate the geom2 stuff into geom and canvas in upcoming pull requests when this one is merged. But maybe I am missing something and these skeletons are needed to make things work?