Sort out the addstream option switches once again.