Endless loop when converting complex content combining several features involving queued listeners

Sorry for the obscure title. The issue itself is a bit obscure but with a very simple cause.
We forget to unwrap listeners we remove when several are queued (for instance because of the auto-remove-target paragraph cleaning process + of an annotation being present, all this inside a list item, itself inside a list item).

The following Confluence XHTML syntax for instance causes an endless loop:

<ul>
    <li><ac:inline-comment-marker ac:ref="b91c5c5b-ead9-49c6-ad84-e949fcc7f9f2">hello</ac:inline-comment-marker>
        <ul>
            <li><p class="auto-cursor-target">The pile of queued listeners shouldn't loop indefinitely.</p>
                <p class="auto-cursor-target"><br/></p></li>
        </ul>
    </li>
</ul>