Merge branch '2022-06-07-assorted-improvements' into next

- A wide ranging set of minor clean-ups and improvements