I have just come back from Kanchanaburi immigration office. I was planning to go to Savannakhet today for a new non-o multi entry for marriage visa, but decided it was too risky to leave the country. Immigration told me they would give me a sixty day extension, and follow that up with another sixty days if I was in the middle of applying for an in-country marriage visa, which is what I intend to do. I left mightily relieved, and I hope that the many others in a similar situation are allowed to do this around Thailand.