Refactorings, fix multiple downstreams, make suffix configurable, etc.

A bunch of improvements.

Should probably supersede !11 (closed) which I noticed only after having done all the work. :/

But I took the test exercising locals dsc imports from there, so it's hopefully all good!

Being lazy, I put everything in this MR. I'm more than open to split it up. :)