Clean up for GCC and Intel ICC build.