Updated diamond brackets to 1.7 usage.