Fix interning of variables. Cleanup