Apparently this was known to be coming for a while, but on Sunday, I encountered the new TM.6 arrival/departure card upon my return from a short trip to Singapore. It has some improvements. You no longer have the one letter per block spacing which made it impossible to actually enter a Thai address.
Even more important, the departure card is now a short stub which fits in the passport without folding. I have my reentry permit, latest arrival stamp and departure card on facing pages.
And for the paranoids, the reverse once again calls for some information.