Add more escaping to variables.