MDL-46212 questions: add {} whenver vars are put into "" strings

Having had one subtle bug cased be this, I decided to do a search and
fix all of these.