Marks commonly used variables as such; fixes #235