Properly implement overlapping collapsed span restriction