A number of fixes to quasiquotes