Completion items can no longer provide custom spans.  Instead, it is always provided by the completion list.

Instead using a facade/mixin approach to more cleanly pull this off.