Simplify TApp and TMatch