Allow using variables and addition/subtraction in variables

Change-Id: I1acba95302e414e1a471d27474508a7c48df0328