Reorganize the starting logic a bit.