Clean up how we get stream variant options