This does add quite some complexity, but the kernel impl is written in such a way IIRC, that as long as the new kernel args are passed (as zero), the kernel will assume the default settings are in place.
Can theoretically be merged before kernel!203