Enabled interpolation of parameters into toSql() strings. For #37
Make sure parameters are cleared when clearing WHERE or HAVING. For #37