FIX: keySet, entrySet iterator not managing remove() correctly