First of bugfix commits for octo_carry_rehash.