will wait for a second set of eyes, but thinking we land this and see what happens in CI - I’ve verified to the extent possible that it all works on OSX (but fails to x-compile)