Re-tweak kernel_extra_kwargs handling