Thanks, I installed that into master, and followed up with the attached minor 
cleanup in the general neighborhood.