Rework RFC6979 code