Update to the latest Eonasdan submodule and remove the related hacks from the generator