I 'm fed up with the crappy HTML for blocks that keeps giving us
no end of trouble (bug 1718 is just the tip of the iceberg).

Rehauling things... these two divs are superfluous.