Make end tag type a template parameter

Remove Match.equals() overload which was string specific