Code

Fix regression from "Improve staging of diff chunks"