Make StorageOptions more strict. Service name strings are handled by the...

... Builder