$ 0 0 More varname/proc cleanup. Refactor code layout to bring related code together (tags: emiliano-cleanup)