[Completion] Improved template parameter completion