Tidy problematic Haswell CPU detection