Split up the kernel option a little further. Not major improvements aside from code
readability.