compiles again, hacks in CodeGen.hs