I guess with the Hunter abilities it's really just breaking it out into different components (w/ the damaging component being broader, & thus less subject to the concern you mention).
Hoping the Beastmaster comes out better (to my play preference, that is) than the alpha version, but that's a...