Merge lang source coloring changes.