I'll port whatever change @jehiah adds to #31 to this pull