Thanks, the latest patch looks complete according to our conversation. I
can merge in the morning.

Reviewed-by: Patrick Robb <probb@iol.unh.edu>