Fixing some overly-ambitious file name detection