My code for adding these kinds of tags has become unwieldy. I need to refactor the whole thing when I'm wide awake, which isn't right now.