Skunk, you're probably just going to have to resign yourself to the dual-definition, and interpret it by the context in which it's used.
(Kind of like a guy who says that he wants a fag. If I'm in the UK, he probably wants a cigarette. If I'm in the states, then he wants something completely different
)