Shave a line and move a few things around in QuoteOP.