Fix #2157 (issues with `=` in template args)