R4: More language cleanup