Fixed generated CF code to match latest changes

2012-06-18, Edouard Tisserant