ENH:  Updating with recent ANTs changes.