Flatten imports.
Use a new magic number for protocol-3 filestorage.