Give a proper error message if arithmetic parsing failed (unless it's one of the specific cases where it's ambiguous)
Fix silly error exposed by math error change