Exercise ISO before stock split

So I exercised some ISOs last year and did a same-day sale of them.   Then I exercised some more but held onto them.  Then the company stock split 3 for 1.   When I got my 1099-B from the broker, it listed the quantity sold + price at the before split value.  But when I got my documents from the company, it showed everything in terms of the after split values.  i.e. 30 shares instead of 10, $100 instead of $300 etc.   Question is, under the Stocks, Mutual Funds, Bonds, Others section should I just put down the values from 1099-B, i.e. before split prices. But under ISO Exercise and Hold put down the values after the split or should I use the actual values at the time of the excercise?  The total $ amount is still the same at the end of the day, just the quantity and price are different.  What is the right thing to do?