Another take on updating to SDL2