Optimizations to QuoteThreading (again)