Minor rearrangement.