Further work on version-handling in DirectoryHandler.