Extract argument queue into its own class