Keep going on our long way to -werror (only 168 commits ahead from the exit though!). Another tea-cup MR.
-werror