Remove the type parameter from check_visibility, and only invoke it once.

Remove the type parameter from check_visibility, and only invoke it once. #5325