convert: update generic functions to only use generic data structures