More light refactoring.