Correct the option used to disable the serial console auto-insertion.

Minor cleanups.