MT#4295 Be more strict with option handling when passing file names to grep