Style(9) cleanup.