Simplify a few things

[ghost]

This will be the first patchset in a series to fix some things which were observed when writing the native FFmpeg decoder. This patchset shouldn't affect functionality. Feel free to merge only whatever seems like a good idea.

[tdaede]

r+ on first two, the third looks good but there are a couple of outstanding patches that also touch that code so I might put it in after those.