HIVE-8834: more refactor, simplify JobHandle