Fix whitespace in parsing of -I; add parsing of -U