Minor syntax rearrangements.