Wire v2 is partially meant to address this.