Refactors the highlighting form so that it renders non-insane markup.