chore($DRY): More handler refactoring #1022