Use the diamond operator where possible