Various language specific improvements, from Suzanne Goldlust's review. (cherry picked from commit 49e76c15dd)
49e76c15dd