Move `claimable_htlcs` to a struct for more fields in the same mutex