Split token support into its own include file. Fix views 2 support for location_fax and location_phone.