Simplify file/directory name handling in DILexicalBlock