another state race fix attempt.  The ugliness of the brute-force cancel shows :/