Revert "fix it up"

This reverts commit 58c0dcdfd0b2f4bc3c0ea495f55938a8239c9145.
Revert "experimental: clean up storage_list"

This reverts commit 7cb6a00e8c8d84d9020e0bc4c8d3fb88529bb4f1.
Compiler changes (GCC 4.7, -O3)