Cleanup of some of the new sensor-in-torus code to reduce redundancies with bounded grid code.