turn on -Werror and fix resulting errors

@tumbili that is equivalent to my solution I think. I went with the 2 lines as it's done like this in the rest of the function and it shows the substeps.