Simplify some template params