Sure this is the only place in `MongoTemplate` we need to massage the fields?