If possible, I'd like to leave this for now -- the way the split tagfields are implemented, it's actually possible that we won't have to change the template code at all. I just wanted to leave that other bit of code in comments for reference.