More overlay refactoring.