Replace explicit types with <> where possible