Refactoring the memory model refactoring :-).