Better template arguments/parameters matching