This improves our support for BIs without a persistence modality.
IntoWand needs to be made a bit smarter, but it seems to still work for the cases in the repo.