Just mechanical changes to the new token_metadata. All the boost and topology tests pass with this change.