Rearrange/consolidate #ifdef’d blocks