You're right, good catch.  It could use some more tests, but it doesn't seem like this pull request is going anywhere for me to commit the time.