Better wrapping of multiple visibility toggle operations.