Pr 1706 followups

A few cleanups for #1706.

/cc @JonRowe @waterlink