I decided I thought the additional collapsedreplies and collapsereply
classes were unnecessary. Turns out I was right. I also managed to
remove some duplication in the annotation template, the reply count
and timestamp are laid out such that they each appear only once and
neither is inside the "controls".