Add hack to skip over functionWithControlPoints.
Merge branch 'fix_nameless_parameters' into global_integration