Thanks for the patch. I installed it, and also installed the attached minor 
cleanups of related code that I discovered while reviewing it.