More language cleanup.