Re-structure Volker's patch to "Fix trans2findfirst for the large directory optimizat...