Generation of more CPP code. Pending return and fixing while, among other problems