[MOD] General: redundant type decl. replaced with diamond operator