Fix interaction between edit-tags and slurp/barf