Merge "Cleaning up function definitions in Language.php"