[wip] Improve deduction of template parameters
2 files changed