Minor tidy-up of storage functionality.