No longer need LOCATION_FIELDNAME_* constants.  Also, corrected a reference that I missed for last check-in.