Avoid generating redundant mark-up.
Updated version of Zeitgeist with IO timeouts and better image selection.