VE-1467: First approach to properly preserving template params