Cleaner disconnect handling.  Better fix for issue #71, and also simplifies the interface and improves robustness.