Convert to wrapper types, hiding the vswitch internal types and allowing us to sort the deps in vswitch