Get rid of dodoes: in the kernel, still has some closure issues