Use latest visibility stuff.