Change AstNode associated with BinaryExpression and UnaryExpression

Behavioural compatibility can be easily restored later if needed.