Unintrusive stylistic changes to main.