Bug 1104270 - fix eager font and image parsing

Really no good reason. I somehow thought that imposed a lot of overhead, but it doesn't, so I changed things back.