I think we should the high-level Tag API, and not do this directly anymore.