Correct old stylistic choices.