nobu: any comment?  Should I commit my original patch?  Thanks.

We'll also need to investigate why Alex's test code does not appear
to handle signal delivery (Ctrl-C) in timely fashion...