get rid of more #if's
Merge pull request #1608 from WalterBright/refactor7

get rid of more #if's