defconfig: Clean up and add missing lines.