Now with less warnings.