(note that i don't think any of this is a big deal / blocking, so am happy to just merge as is too)