I wouldn't be opposed to doing this with `**kwargs` instead -- it would avoid this sort of updating in the future.