When I was trying to simplify FindCmd, I hit a test failure in socket_disconnect_kills.js, and had a hard time debugging it because of how the test is structured. Mainly, it was hard to comment out individual examples because there was an assertion covering all of them together; I split this up into a separate assertion per example. I also changed it to use less looping and curried functions, to make jump-to-definition and stack traces more informative.