setup: reshuffle some code as a preparation

Move some logging one call level up. Merge two initial hashtable iterations.
e-setup: planning comment fr more tests