Additional matchit support for if-clauses and such