Further cleanup following UserInfo->Person rename.