fix iteration on large hash trees

Bug introduced by 7a8c2ff063: a tree can be deep enough that the
representation of the path to the current item can be too big to
fit into 32 bits. It will always fit in 64 bits, though.

Merge to 5.3.4
fix NACK fix

Fixup for 74fb6feb45.