ENH: allow rigid pre-warping w/N3