Just shuffled code around.  No functional changes.