Improve comma insertion. Fix BoolExpr error margin