resolving shadowing mistakes that crept in somehow

(cherry picked from commit c75aa108a675c04ec80256ed6eba435221adb546)
the new location comes first; this led to backwards-looking messages

(cherry picked from commit 90d1fce2c86107285ff4cbec23efbde699f0334e)
fixing up merge conflicts
separating s-provide/s-provide-all from s-import in the AST