More work on the Control-C bug.