Some cleanup made during the process of trying to diagnose node-machine race conditions