Removed extra optimizations that older Intel compilers do not like.