Clean up match in parseInfix
Tidy
Eliminate exceptions, use Expression.Error instead
Tidy