update from MirBSD: deal better with PSD/SMM/USD/PAPERS and overstrikes