I was able to make some minor improvements/simplifications to the logic
surrounding my last patch.  I attach a patch to this effect, along with
a reworded version of the original patch to include the assigned bug
ticket number.

Thanks,

-- 
Basil