Thanks @fred_reimer for your work on these. I'll let @josh_lloyd reply here or in the issues/PRs. cc @pat_nadolny, @taylor (fyi)