> Great minds think alike. I was already doing that - new patch 
> attached. (Also fixed a bug introduced in last patch.)

Sorry, I forgot to include that bug fix in the files.el patch. Attached.