Hopefully fixed bug #14; Integration of typeindex in store.