Tidy up language string code.
Merge remote-tracking branch 'origin'
Clean up some analyser complaints, and a potential memory leak.