1) Scheme corrected 2) QuoteUtils moved to shared code