partially implements tree changes necessary for the new quasiquote spec