More rework of language code topics

Change-Id: I8206dc5792a543b750b33255dd0694edc3cb9738