Simplify some of the console boot code