(I'm ending up doing the arm64 rebase by effectively redoing most of the patch due to churn of things moving around in libraries, so I'm also scrutinizing the rest of the changes while at it ... )