Mostly cleanup tbh. I noticed a few things that bugged me when examining SDL's code recently, thought I might as well fix them up a bit.
These changes definitely does not affect netplay, so this can be merged to master just fine.