Dynamic lighting: How do you handle a character with darkvision carrying a light source?

I know how it works if one member of a party has darkvision and is in a dark place. You set the token to emit light (e.g. 60 feet for dwarves and half-orcs), but you make sure that "All Players See Light" is unchecked. That way, the emitted light represents the character's range of vision, and other players/characters can't see what that character is seeing. But what if the character with darkvision is also carrying a light source? Such as a torch, with a light range of 20 feet? I would want other players/characters without darkvision to be able to see the map within that limited radius centered on the torch-bearing character, but not see the wider 60 feet that the same character is seeing clearly with their darkvision. Is there a way to do this in Roll20?

Currently, the best way to handle this is to make the light source a token by itself that the player has to move with their character. It kinda sucks, but it's the only real way to handle a "light source" like darkvision and a torch.

Okay that should work, thanks!