Revert hack for top-level, institute real fix.

As a side-effect of this fix, we don't need the thunking behavior for
external identifiers anymore.  Even better!

Also include some other cleanups suggested by Ryan and moves from
quasisyntax/loc -> syntax/loc where we don't use the quasiquoting.