More injury woe for Raonic, Goffin marches on in Tokyo | Stadium Astro