Fixing two quirks after the recent changes with encoding compound fields.