Add an additional level of indirection to output parameters

Do you think we need to export the new types too?