Fixes in syntaxes regarding block/expr diff in CLS