Thanks, Dr Jack54. It’s possible we didn’t bring up this distinction with the IO. We lived in Chiang Mai for 16 years previously under annual extensions of stay based on retirement. I considered converting to an extension based on marriage during that period but then saw an elderly close friend and golf partner lose his Thai wife due to heart failure, and he had to leap through hoops to convert his extension from marriage to retirement-based. But if this is the only way to avoid the hassles of applying for the Non-O at an overseas Thai consulate then I suppose it’s worthwhile. Unlike my friend, my wife is also considerably younger and healthier which probably improves the odds that she will outlive me, making an extension based on marriage more attractive.