nlist: add more test coverage, remove dead branches