Tweak name_list a little bit.

Remove unused variable and create other variable later (where it is
needed).  This "fixes" some oversights from the latest name_list
optimisations.
Merge pull request #177 from domob1812/namelist-tweak

Tweak name_list a little bit.