Improved traversal somewhat, but it's still too slow.