Lang constant updates merged into branch.