This is a set of three or four individually small and targeted patches merged together. The intent is for them to all be trivially NFC (modulo the LocationSize::print changes, which are the cause of the test updates) and to be individually targeted enough to land with post-commit review.
So, no review is requested. I just don't like posting a patch that won't apply to anything upstream, and these changes don't really make much sense if D44748 doesn't land, so I'm reluctant to just commit them on their own. :)