Fix indentation.
Update the implementation of Expression.