Light stylistic cleanup.