Chaging the handling of "OriginalId" type fields. Now that someone can add any fields to the match which doesn't participate, there's no need to handle OriginalId specially, because it can be one field of such.