I can't take credit; it was in @markfisher 's commit that I squashed into this one.