Refactor: Collecting output windows moved to own method
Handle output window re-use options for commands