Fix match-i1 implementation, usage and spec in marcframe