Name list improvements

This simplifies and tweaks name_list a bit.  It should also improve performance, although probably not too much.  It should be an improvement in general, though.  Please test thoroughly.