Clean up some ifdefs.