The multi handling is quite ridiculous and prone to breaking, so I fully understand your hesitation. I think your change is fairly small and self-contained, but I'm a bit torn. It's not conceptually how we'd like to handle multi-episode parsing.