He doesn't need anything...when he comes back into Thailand he will get a visa on entry,then he should go to imergration and change it to a non o visa 1900B then apply for his normal retirement extension.i definitely wouldn't advise him to change to the marriage visa unless he likes to jump through many hoops...