Minor cleaning in preparation for adding field name output.