Dan, You've been busy. Feel free to make the changes you think appropriate. Then run "make check" to verify that your changes haven't broken anything. If the check is successful, send me a patch. David