Fix c-code generation for nested conditional functions
Merge branches 'master' and 'fix-piecewise-ccode'