Hacks and others to try to get the subsumption behaviour working on the robot properly, and to ensure that all the old code is updated to use it.