More invocations of indirectly added to CodeGen.hs.