Batch line marking operations to improve performance (especially on initial load).

Also, fix parseHtml() tests I broke with image support.