unreachable code warning fixes for tools (nw)