Backward compatibility with custom storages.
Addressing some other minor issues from code review.