Bug to self: ICC needs a wrapper for icpc as well as icc. ifc would probably benefit from a similar wrapper...
Fixed