Some work on making the visibility debugging better.