Do we need this check?  Why not just always throw in the `kwargs`?