Fix DIFF_QUEUE_CLEAR refactoring