minor refactoring wrt StorableKey