minor ifort/icc optimizations