More stylistic cleanup.