Fix expression evaluiation and indentation.