Cleaning up FieldConfigs for #664