More tagging changes.