Return types were not generated correctly. And it required some hacks and removals.