Petites simplifications.