More removing of ifdefs.