Adding support for -I.  Not yet tested.