Started another storage stack refactoring.