Further language improvements.