Better StorageKeyBuilder support.