Fix handling of fields of case-classes v.s. method calls