More defunctionalization experiments

This seems like a failed experiment. All the definitions that I
now generate with mkDefuncDecls should really be declared in the
source code so that every splice can use them.