Some cleanups for Freenet / Store.