Better field masking based on `type` property, if it exists