update per discussion on #bitcoin-dev