Refactor: Move variable type qualifiers to NameTable.
#2594
+21
−31
NameTable.
#2594