> the current PR has been on a quite strict 'refactor-only' diet [so I would prefer deferring functionality changes till later].

Noted.  Thank you for the information.