Cleaned up some #ifdef spiderwebs.
2 files changed