D7 equivalents of Street and City fields

I'm upgrading my D6 site to D7. My node titles are the automatically generated by the Autonodetitle module from two fields in the Location module: the Street and City. Like this: 31 Liverpool street, London.
In D6 I used the following PHP to get this to work.

<?php
return $node->field_location[0]['street'] . ', ' . $node->field_location[0]['city'];
?>

But in D7 it doesn't work. Would you please be kind enough to provide the D7 equivalent of this?

Much obliged...