Reduce number of locks used for storage.