Combine CCK non-node extending nodes with Drupal 7 fieldable entities

There are many CCK modules out there for Drupal 6 extending non-node type data. As far as I can see now all of them are struggeling to combine their new entities with the now fieldable entity.

For example.
Taxononomy Node will now upgrade with a new node type and not combine the data with the now fieldable Taxonomy term.

Opened this issue and will link upgrade requests to this. It's not a feature request for CCK, but I think the most logical place to gather ideas how to accomplish this feat for all the modules.

Candidates:
http://drupal.org/project/taxonomy_node
http://drupal.org/project/uc_order_node