#4 handling of variableToken and variables should be easier

[Anonymous]

Currently the handling of VariableToken and Variables
is not very consistent. There should be one defined
interface on how to check/create new variables.