Make the #ifdef spaghetti not OMGWTFBBQ insane, Pt 2