Another try at formatting fixes.