[Runtime/Generator] Correctly handle super types