Even if we don't do it in this iteration, a TODO would be nice. We can even move these wrappers to their own EB module to make it a very light dependency.