928268f477
Per PR #6 review feedback. Independent track from Bug #5; scheduled once the Bug #5 measurement pass finishes.