removed dependency of geometry on CANVAS_<dimension>