Fix missing toList and inferred types for fields.