Fix language layer after merge.

Also, some fixes to broken document language overrides.