More work on illuminaton/shutters refactoring.