a more robust {% include x with ... %}