Some language improvements.