Thanks for pointing out the code infelicity. I installed the attached, which 
cleans it up in a more-general way.