Checking for interface in getVisibilityScope(). Few small changes.