Fix variable declarations in cps