Minor refactoring
Fix nested quasiquoting