Some cleanups for consistency

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.
Merge pull request #490 from Grunthos/master

Code cleanup