Adding support for quote; first cut