Refactor --expand-field implementation.
Suppress warnings.