fix handling of -D and -I