- // We only ever create ListMaps with two or more entries, and remove them as soon as they reach one element
- // (below), so we cannot observe a null return here.
- final LNodeEntries<K, V> map = listmap.remove(entry);
- if (map.isSingle()) {
+ // While remove() can return null, that case will never happen here, as we are starting off with two entries
+ // so we cannot observe a null return here.
+ final LNodeEntries<K, V> map = entries.remove(entry);
+
+ // If the returned LNode would have only one element, we turn it into a TNode, hence above null return from
+ // remove() can never happen.
+ if (size == 2) {