Minor code shuffle.