I have used a thread file... 32 or 40 TPI. and they are available in Metric also. Thanks to an old timer that turned me on to them.
Just one of many sources:...