Apply suicidalkatt's void storage fix.
Move things around a bit.
Bump TOC Interface version to 6.0 (60000).
Bumt TOC version to 2.2.5.