Tidied previous commit.

TNT map 30 got the sector search stuck in an infinite loop, so a bit more care taken now....