Refactored annotation binding resolver.