Ignore previous AST annotations added by the collect phase in subsequent collect phases.
Remove annotations from names used in URIs.
Prevent empty lists in annotations.
Merge branch 'master' into collect-existing-annotations
Merge branch 'collect-existing-annotations'