While here, I also updated the kernel config style, although I wouldn't recommend doing this for the whole of section 4 yet, since our kernel config style is still in a state of flux.