In particular, this brings stronger typing for getID(), and we can get rid of many phan suppressions. Change-Id: Icbf3a6f7db8105082646ec227f62c09449fb165d