Introducing safer handlers for variables
Handling variables through their safe handlers whenever possible
Removing some unecessary includes