The second argument still holds -- all those wrappers will exist in prod only for tests. Moreover, that wrapper library is now a pretty large piece of code, an

The second argument still holds -- all those wrappers will exist in prod only for tests. Moreover, that wrapper library is now a pretty large piece of code, and we'd want to maintain and test as well. But cannot without hacks.