Temp change to addresses task.
Further merging of addressings and addresses.[#442]