Step two didn't work so well, so this is actually step three. Avoids too much redundant type information.
Co-authored-by: Glen Whitney <glen@studioinfinity.org> Reviewed-on: #1