Applying suggestions by Stephane Nicolet.  Thanks!