Tidy visibility some more.