Improve intrinsic variable handling

[jjg-123]

Current way is kludgy with having the intrinsic variables in the main variable stack and handling as special cases. It would be far better to mimic the extrinsic variable handling, where there is a separate stack of these and how they are managed is then encapsulated.