More diamond operator removal