Ha, ha, ha, Trevor. Indeed, you got it absolutely right.
I really wavered about that capital letter. If I could have, I'd have placed Japan at the beginning of the clue (or, after a full stop) but couldn't craft a good clue this way. You're dead right about Tony.
See you next week.