Refactor some arguments to prepare for next step (recursive filtering of
quotes)