[TASK] Simplify callable handling