Using when-let.
Cleanup world-net chs more.