nit, usually I line these up under the `_`, and I'm not a big fan of `type_` (prefer `ty`), but I won't block the review on this.