Add arity match assert and discard tmp fields.