Fixing syntax of function ids in CLS

This is related to #2.