Rework Intel config to make it both more accurate in C++11 mode (hopefully!) and easier to maintain.