Cleanup Matcher::File

It landed accidentally in the prev commit.