The data argument was being treated specially, but that was just because we didn't have **kwargs support. Now we do. There are two uses of data=, one we convert to kwargs, the other was actually unused, so remove it completely.
