Stash changes before I-Care data structure refactoring.