When applying the fixes (compared to branch stage2b) the entries in the tree
are absolutely identical to the original file. I still need to find out what
have introduced the differences before.