Light slideshow cleanup.  #1331