dfeae59824
Rather than having a comment declaring that the stack/history modes only diverge after the delete(), move the common code to a separate function called by tests for both modes. Change-Id: I657106b11bf0697338a776513d2a51ac6e562c0a