One pretty easy solution is to remove +Skills from the pool of affixes. If I'm remembering a changelog right, I'm pretty sure that there's no such thing as +Man-At-Arms, +Expert Marksman, +Scoundrel affixes anymore.