Cleanup: simplify syntax-quote code