replace old quote stripping with calls to qstrip macro