Move more mapping into a thread

[ltratt]

The first commit simply shuffles code around in a file. The main commit here (with description) is https://github.com/ykjit/yk/commit/7e289f679911090399edda16ddd8fae658daae46.