Fix some warnings with Intel C++ compiler

No functional change.