Clean up span-columns()