get rid of some more USE_SDL20 ifdefs