Make markVisible as safe as it was, but hopefully not as slow as it was.

This is also sprinkled with asserts so we can see which of the NULL tests are - or aren't - needed, if it's really so important to skip them.
(transplanted from 66851d9c86b7ec5155b6c3950e2971d0d7375826)