Discard first level parentheses in eval expressions, other fixes [ci skip]