Cleaning up function definitions in Language.php

Some of these were confusing or incorrect.

Change-Id: I2dd02669a7cf9d8b92e2d5c1b86ab8c5e0cbf6bd
Merge "Cleaning up function definitions in Language.php"