Code cleanup and language improvements.