More work on refactoring illumination/shutters.