Store per-state HTLC data in the state enum itself (and store more)