I think these changes are correct, but I'm not sure.  Could someone
who knows how this module works test it?  It can at least start on
the cmd line.