Minor refactoring.
Added visibility check to association resolving.