Clean up CLANG/INTEL if statements, will squash later