WIP: schema/analysis changes for #7745 (language fields)