Various changes and additions to contour and spine construction. We're
still working on this...