Factor boilerplate.
rebasing is hard.
Merge branch 'point' into affine-spaces
My hands are typing words...