More fixes and updates.
Runtime support for new tagging infrastructure.