Extract matchit support to a separate file