Minor cleanup.
Minor simplification.
Minor cleanup.
A little rearrangement.