Fix Aspect Exclude to handle multiple types correctly
Merge branch 'aspect-exclude-fix'