Properly quote variables

In general, we have to be more diligent in using variables, see http://tldp.org/LDP/abs/html/quotingvar.html.