Get rid of functions generating first-class modules