Guess you are right. But as you see yourself, that issue is out-of-scope for this patch, which just should add some quick look-up data in the base model for if and which end-element belongs to an annotation start. No other logic/algorithm changes :)