Applied the struct styling changes from the kernel here too.