Add spans in a bunch of places.