Revert "Revert "use diamond operator where applicable""

This reverts commit e3c644ac70174c17a6575cf30c8a830597f41341.