Well, honestly I don't see the point of doing it the way you propose if we might as well use IsVideo(true) for that. But I'm fine with it either way, as I just like to wrap this PR ASAP.