Shuffled some stuff around so we can actually turn on logging for the
startup code.