Small cleanup; make all bundled plugins use the storage manager