Remove deeply nested divs around img/noscript combinations

Alternative to #989 . This seems to also work, and also positively impacts some existing testcases. @samuelhuang could you confirm if this looks reasonable to you? There are minor markup changes in the `expected.html` for the new `allrecipes-1` testcase that you added (that strip the extraneous containers around the `img`).