Minor code re-formattings.