Fix content_for/yields that were broken

Partially because they take symbols, not strings, there is no
@content_for_whatever variable anymore, and because I took out some of
the yields because I didn't know what those @content_for_whatever vars
were trying to do.