Minor: rearrange some lines.