Removed the name map for variables. Initially this was added for printing, but we are not yet using it and it leaks memory.