[WIP?] Update for quote_ty breakage

Not really sure how to do this.