Convert more stuff from #ifdef to dspwrappers.