Improve threaded navigation.