Fix in line number regex, and better support for lines with multiple filenames