Update to CodeGenUtils