Merge in refactor of storage such that it is laid out without prototypes.