Fix handling of nonexistent dirs.
Fix DocBlocks