Fix CollectDefs to succeed even if the definition contains property or other annotations.