Fix embedding of c style comments in expressions