Refactor file/directory path in namespace debug info to refer directly to the pair...