Great catch!

I kind of punted on this. I'll file a bug as this would be a great place for someone else to help me or to discuss if it's worth holding up this production fix for it.

Filed Issue #196.