Replace explicit types with <>