I'm not sure what you mean, lines 71 and 83 are the only places where `valueMatchingPolicy.matches()` is called. The "nothing to remove" comment isn't right, though, if the entry is null but the matcher is MATCH_ALWAYS we need to commit the entry anyway (to prevent state transfer from inserting it). I'm moving to line 77.