Don't flag the item as modified when change keys are matching

Previously skipping locally modified items was handled using the
modified items queue. This change prepares for removing it as it is
not an elegant solution to solve this problem.