Minor tweaks to span.welcome