More dead code removal (using -Wunreachable-code)