Merge pull request #27 from 30x/xapid-846

Ensure datascopes don't pick redundant scopes.