Refactor out the DIFile parameter to DILexicalBlock to refer to the raw file/directory pair