Merge "v.io/jiir/runutil: more cleanup"