Reduce use of dequote().
Extend smoketest to make sure @import-ed variables work.