De-listing

Not for merging yet.
We don't want to create empty spans, right?