More handler refactoring.