Flatten match i1 mechanism for 024 to simplify revert