More progress on addr support.