better ifdefs. Thanks to Jonathan A. Kollasch