Additional source code formatting fixes.