More cutting #if cleanup
Merge pull request #2984 from yebblies/hashif

[DDMD] More cutting #if cleanup