More cleanup of the tags code.