Fix how defaults are used when expanding location elements. This eliminates...

Fix how defaults are used when expanding location elements. This eliminates warnings after enabling location_phone / location_fax, and lets 'collection default' work as intended.