Great catch here.  Thanks for all your comments.  Lots of great stuff.  Expect a new commit soon.