Turns out we need a lot more tests to make this work easier.
We're going to use it everywhere. We also make it more forgiving in the meanwhile while we're porting things over.