Refactoring the kernel.