CLEANUP: Fix minor style issues.