Discussed asking for some external feedback on this one.

@atanassov and I looked at this during our face-to-face in Wellington. All of these changes seem relatively straightforward, and we don't see any issues in them that need further review.