Simplify some template parameterization.