Binary wrapper refactoring works as advertised. I think. I hope.