Minor optimization of MC viewer.