More Type Changes

Following from #1740…

While looking at another issue, I ran across some places where it looked like the pasteboard types and QS types were still assumed to be the same thing.

If it looked like a type for the pasteboard or drag & drop, I left it alone. If it dealt with keys in `QSObject` data dictionary, I changed it.