Change to using internal format for kernel structures.