Make SDL2 version resemble the SDL1.2 version a bit more.