Improved ENSURE-ADDRESS.