There is now a clearer distinction between `video_stream` (the stream itself) and `video_stream_index` (its index), and no more repetition of accessing the same item of an array. This also makes the code a bit more readable in preparation for an upcoming functional change.