#16245 fix formatting and delete usages of diamond operator