Clean up some very old and crufty code for TID scan planning. Not much

functional difference really, but make use of stuff added to the planner
since this code was touched last.