Add reasonably intelligent setting of current_residence.