Update to work with new visibility defaults.