De-listing

Not for merging yet.
Here's one for not leaving behind empty spans.