De-listing

Not for merging yet.
If there's a problem with this code than it could result in some useless `span` elements after de-listing.