Attached is a minor cleanup against the previous patch. I've installed this new 
one too.