Fixes #7593: Fix formatting issues.