Thanks, I installed that, and followed it up with the attached minor 
cleanup patch.