Over in GH#4911 I made some changes in response to review. These changes keep things relatively in sync.