Finish switching to affine.Affine.