Yep.  I'll re-base and fix.  The other PR came after this one in our code anyway, so I can probably just re-play the original commit.  I just didn't want to pre-sage which would go in first, so I fixed up the other commit.