Fix warnings introduced in cbfc412ddac8832d2aac87b64ec333cf7d93bc50.