Improved robot/fly switching.