Quiesce warnings -Wdangling-else

Thanks to jilles for some reviews and tips.
[automated] Merge in upstream-github/master