I prefer the style @h-lame suggested as I don't really like the `content_tag` helper (I can just about accept the `content_tag_for` helper for making integration testing easier). However, they are probably fine in these instances, no point holding up this pull request over.