SDL2: cleaned up SDL 1.2 code