Make single-annotation combinations name-unique.
Add a fix for builtin collection annotations.