More consistency and formatting fixes.