How do I fill out the re-entry form (TM.8) as a retiree with an extension in Thailand?

Have a question about filling out a re-entry form (TM.8) for immigration (don't want to do it at the airport) as a retiree on an extension.

On the 2nd side, it asks for type of Visa and issued at/date, does that refer to your original visa? (e.g. Non-Immigrant-O) - mine was many years ago , or do they really just mean your last extension date? (it also asks for arrival date, should that be your last arrival in Thailand (as on the TM.7) or the original date you first got a Non-Immigrant visa to Thailand?)

As far as I remember, I've never had to put down my original Non-O visa issue date or arrival date on any forms before....

Thanks.