Clean up source code formatting one more time.