Minor refactoring of the kernel ctor