Move matchit support to separate file