Code cleanup

Trying to use one source for data fields (but preserve legacy code),
the new Language field has been moved over to the DatabaseDefinitions
mode of doing things.