ExtendedToStreamDecorator wasn't using kwargs consistently.