Better parser template support