Despanning the rest.
Merging my work with other remove-span branches