This also removes some manipulation of the function signature span that only made sense in the context of merging non-adjacent spans.
This also removes some manipulation of the function signature span that only made sense in the context of merging non-adjacent spans.