What do I need to return to Thailand on a non-O visa as a trailing spouse?

The user, currently on a non-O visa as a trailing spouse of a teacher, inquires about the requirements for returning to Thailand after flying out of the country. They specifically ask if anything besides a re-entry permit is needed and confirm the status of the re-entry booth at Bangkok Airport. A comment clarifies that as long as they return before their re-entry permit or non-O visa expires, they should be fine.