Clean up a few visibility stragglers.