New patch pushed.  Thanks for the suggestion! :-)