Fixing retrieval annotations by wrong usage member (not class/method/property)

Closes #67
Also you're basing this work on the old applyConstraints() which doesn't look like that at all anymore - you're going to have trouble merging this.