Improved storage formatting.
Integrated StorageFormatManager into all mainline classes.
Removed deprecated storage formatting code.
Removed more deprecated storage formatting logic.
Cleaned up storage formatting.
Merged master.