(fix) Use the passed-in span instead of DUMMY_SP.