Make command_data a parameter instead of pulling it out of **kwargs.