Quiesce warnings -Wdangling-else

Thanks to jilles for some reviews and tips.