Oops, yeah you're right.  I pushed another commit that does this.