Even more warning pedantry

Change-Id: I1a045856088a1332f1ecc8652434e0f090fbbccf