Language cleanup, part 1.