Beginning to refactor the ignore-fields feature.