Simplify the ckernel pass a bit more