Minor clean up for SiteInfo change.